Switch to new Microsoft.DotNet.SharedFramework.Sdk#909
Merged
RussKie merged 22 commits intodotnet:masterfrom Jan 5, 2021
Merged
Switch to new Microsoft.DotNet.SharedFramework.Sdk#909RussKie merged 22 commits intodotnet:masterfrom
RussKie merged 22 commits intodotnet:masterfrom
Conversation
…its shared framework and installers.
Merged
3 tasks
Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
jkoritzinsky
changed the title
Member
|
@jkoritzinsky Can you resolve the conflicts and figure out what still needs to be done to get WD onto the new SDK? |
Member
Author
|
All that's left is to resolve the conflicts (which are all from the Maestro auto-update PRs IIRC). Everything is working in this PR on the new SDK. I'll resolve the conflicts when I'm back from vacation. |
RussKie
reviewed
Jan 3, 2021
pkg/Directory.Build.props
Outdated
| <!-- | ||
| SDK currently does not know about net6.0 TargetFramework. | ||
| We need to manually add these to correctly resolve the targeting packs. | ||
| https://github.com/dotnet/sdk/issues/13950 |
Contributor
There was a problem hiding this comment.
This appears to have been resolved.
Member
Author
There was a problem hiding this comment.
To remove these items, we need to update the global.json to reference a 6.0-based SDK.
…hey build on top of the standard SDKs. Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
Member
Author
|
I've addressed all of the feedback and CI is green again. @RussKie can you take another look? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Switch to the new unified tooling in the Microsoft.DotNet.SharedFramework.Sdk package.